projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5634af4 94bbc32)
bitkeeper revision 1.168 (3e9c2ab9SBj-U-bLUthCsyE5EGQPzg)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Tue, 15 Apr 2003 15:52:25 +0000 (15:52 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Tue, 15 Apr 2003 15:52:25 +0000 (15:52 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

1  2 
xen/arch/i386/boot/boot.S patch | diff1 | diff2 | blob | history
xen/common/domain.c patch | diff1 | diff2 | blob | history
xen/include/xeno/sched.h patch | diff1 | diff2 | blob | history

diff --cc xen/arch/i386/boot/boot.S
Simple merge
diff --cc xen/common/domain.c
Simple merge
diff --cc xen/include/xeno/sched.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.